Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 Apr 2012 17:07:06 +0000 (10:07 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 Apr 2012 17:07:06 +0000 (10:07 -0700)
commit77bc4ef91567e4d9827456535bdf4bb0d74355ba
treeb8d90999f5626930792438110e48c3c34b6c3785
parentccd4c5ffd16bafd79fa27d500e83ff83e640b52c
parent1ca162c3c8f20212c40583c8c80af9375e4fb6d4
Merge from trunk.